Skip to content

fix: Do not panic if WebAuthn.dll is missing#36859

Merged
codingllama merged 2 commits intomasterfrom
codingllama/missing-webauthndll
Jan 18, 2024
Merged

fix: Do not panic if WebAuthn.dll is missing#36859
codingllama merged 2 commits intomasterfrom
codingllama/missing-webauthndll

Conversation

@codingllama
Copy link
Copy Markdown
Contributor

Fix a tsh panics on Windows if WebAuthn.dll is missing.

The regression was introduced by #34737.

#36851

Changelog: Fix tsh panic on Windows if WebAuthn.dll is missing

@codingllama
Copy link
Copy Markdown
Contributor Author

Tested by changing the DLL name to something else (which gives me the exact same panic as #36851) and applying the fix.

// checkIfDLLExistsAndGetAPIVersionNumber checks if dll exists and tries to load
// it's version via API call. This function makes sure to not panic if dll is
// missing.
func checkIfDLLExistsAndGetAPIVersionNumber() (int, error) {
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was right in the func name too 🤦

Copy link
Copy Markdown
Member

@ravicious ravicious left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can confirm that this fixes the issue on that Azure VM running Windows 10.

@codingllama codingllama enabled auto-merge January 18, 2024 15:20
@codingllama codingllama disabled auto-merge January 18, 2024 15:21
@codingllama codingllama added this pull request to the merge queue Jan 18, 2024
Merged via the queue into master with commit 1bc659f Jan 18, 2024
@codingllama codingllama deleted the codingllama/missing-webauthndll branch January 18, 2024 16:54
@public-teleport-github-review-bot
Copy link
Copy Markdown

@codingllama See the table below for backport results.

Branch Result
branch/v12 Create PR
branch/v13 Create PR
branch/v14 Create PR
branch/v15 Create PR

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants